Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update merge consensus to v1.1.0-beta.5 #2630

Merged
merged 1 commit into from
Sep 26, 2021

Conversation

michaelsproul
Copy link
Member

Proposed Changes

Update the merge consensus code to match spec v1.1.0-beta.5

Specifically, this PR incorporates the changes from these 3 spec PRs:

We already matched the new spec on 2 other consensus PRs:

I haven't done anything to update execution engine stuff or gossip validation conditions, as I believe others are working on that (@paulhauner, @ethDreamer).

The tests are updated and passing 👍

@michaelsproul michaelsproul added ready-for-review The code is ready for review merge-f2f Relates to the Oct 2021 Merge F2F labels Sep 26, 2021
Copy link
Member

@paulhauner paulhauner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Merge at will!

@michaelsproul michaelsproul merged commit cce6f63 into sigp:merge-f2f Sep 26, 2021
@michaelsproul michaelsproul deleted the merge-beta.5 branch September 26, 2021 23:42
paulhauner pushed a commit to paulhauner/lighthouse that referenced this pull request Sep 27, 2021
@paulhauner paulhauner mentioned this pull request Sep 27, 2021
7 tasks
paulhauner pushed a commit to paulhauner/lighthouse that referenced this pull request Nov 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-f2f Relates to the Oct 2021 Merge F2F ready-for-review The code is ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants